Skip to content

Conversation

@jrfnl
Copy link
Member

@jrfnl jrfnl commented Dec 9, 2023

Description

Some more label management tweaks, trying to get it balanced out right.

GH Actions/label mngmnt: auto-remove merge conflict label on PR merge

... as a PR wouldn't have been merged if the merge conflict still existed.

(Adding the "merge conflict" labels works really well, but they don't always seem to get removed quickly enough)

GH Actions/label mngmnt: add additional triggers for merge conflict check

... in an attempt to get the action runner to remove the "has conflict" label when a PR is updated (which hopefully would have resolved the conflict).

Suggested changelog entry

N/A

jrfnl added 2 commits December 9, 2023 03:28
... as a PR wouldn't have been merged if the merge conflict still existed.

(Adding the "merge conflict" labels works really well, but they don't always seem to get removed quickly enough)
…heck

... in an attempt to get the action runner to remove the "has conflict" label when a PR is updated (which hopefully would have resolved the conflict).
@jrfnl jrfnl added this to the 3.x Next milestone Dec 9, 2023
@jrfnl jrfnl merged commit d900658 into master Dec 9, 2023
@jrfnl jrfnl deleted the feature/ghactions-more-label-mngmnt branch December 9, 2023 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants